* lisp/doc-view.el (doc-view-start-process): Handle url-handler directories.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e3873651343b51122462e9c1cb8b6937d2d7a1eb..e7ff6676cd42ea65495eb991e5a9edf84c658520 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * doc-view.el (doc-view-start-process): Handle url-handler directories.
+
 2013-04-15  Dmitry Gutov  <dgutov@yandex.ru>
 
        * progmodes/ruby-mode.el (ruby-beginning-of-defun)

diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 6217f5d0a3f930a2bc9b57a9bd8ee6fa438ab089..b1f399d5b73e179bbd39b2f4872bf34d3d961cbd 100644 (file)
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -881,8 +881,8 @@ Should be invoked when the cached images aren't up-to-date."
 (defun doc-view-start-process (name program args callback)
   ;; Make sure the process is started in an existing directory, (rather than
   ;; some file-name-handler-managed dir, for example).
-  (let* ((default-directory (if (file-readable-p default-directory)
-                               default-directory
+  (let* ((default-directory (or (unhandled-file-name-directory
+                                 default-directory)
                              (expand-file-name "~/")))
          (proc (apply 'start-process name doc-view-conversion-buffer
                       program args)))